Backport fix for Bug#9318 from trunk.
authorChong Yidong <cyd@gnu.org>
Thu, 19 Jan 2012 14:55:10 +0000 (22:55 +0800)
committerChong Yidong <cyd@gnu.org>
Thu, 19 Jan 2012 14:55:10 +0000 (22:55 +0800)

Trivial merge